Cleaning in Controller package (not finished)