Last clean up of the rake task.