Cleaned up

Deleted non used files and fixed all warnings, (Unused imports mostly).