Removed obsolete files & imports