Removed some unused files and cleaned up variables