Remove more legacy files, code references
Remove reference to old file in CONFIG