Changed the files and remove all unnecessaries