Removed some useless files
Merge