remove_file_uploads should be called both with and w/o
the flag - we need to decide which way to use on instance level.