fixes, and unused files deleted