Removed some superfluous files and methods to clean up code