Removed code thet refernced refactored classes