Changed the requires a bit
Removed unused files