Cleaning Upload class [WiP]