Merge conflict fix
Cleanup unused files