Clean up upload a bit.