refactoring to remove submission