Cleanup!
Fix for uploading of images