Merge "Remove unnecessary mmodule/simple/ files"