Some Fixes
Deleted files