Removed unused files & rebuild