Small Fixes
Removed some unused files