cleanup, removed obsolete files and using statements