Renames resolver variables
Removes controllers