Cleaning up the project, removing unused code