Handle submission deletion properly
Merge new changes from upstream