Move #clean_out_uploaded_data to ClientBase