more uploader cleanup