MDL-20904, upload function now upload to user private only, remove file_stroage code...