Issue-2, Issue-1: Download & Upload files capability cleanups