Removing unused file and comments