Cleanups with MF Upload