About to consolidate uploaders could be messy