Rearrange graphic removal code
Update Upload plugin
Replace App:Uses() with $this->loadModel()