Merge Into develop Deletion Changes

Viz #224 - this merges #227 into test-merge which is a branch of develop as it wasn't automatically possible. I created this pull request to pause for a moment and make sure I didn't resolve the merge stupidly.

@jtisqo Could you just check this merge is okay and I haven't messed up any functionality? an eye ball of the code should be enough.