Removed unused files, cleaned up some unused code