Removed files and cleaned up code