Merge branch 'cwarden-delete-callbacks' into develop

Refs #44