Got rid of controller