Remove useless file and made changes to some code