remove extra files and some code changes