Merge "Remove references to controller.git"