removed unused files; reverted unused changes