Clean up from moving around controllers