[#G26795] Some code cleanup
[#G26795] Removed add/removal of file usage to submit handler