Deleted more now unused/obsolete code that has been replace or moved with download/upload logic update. Closes #918 Closes #933