Changed upload and fixed remove problem.

Removal of pictures with null file path should now always work.