still removing legacy code