Removed code that went around legacy code