removing legacy code