Remove debugs
Add submission handler