Merge "remove unnecessary files" into 2.0_beta