Easier setup
Removed unused files