Clean controller and rename.