Got rid of pet controllers and services