deleted some stuff from controller