cleaned up uploaders