Clean up files, re-add remove all fles parameter in preparation of auto-upload options