Fixes
Removed unused files