Yes these should be removed!  I first put the upload code in the controllers and moved them to the logic functions.