Break up the outdated class
remove unused files