DO NOT MERGE
Removed unused files
Removed unused code