Little cleaned project and removed unused files & variables