Started removing legacy code