refactoring to remove old submission stuff