remove controller related stuff from master