Repetitive _Delete and _Cancel functions

[funnylookinhat]

Currently, several object types have both a _Delete and _Cancel - where the _Delete method will completely remove it from the database, and _Cancel will only reverse it in the journal and mark it as cancelled. These should be combined into a single function call, _Remove, and that call should automatically try to delete the object, and if unsuccessful, cancel it instead.

Any other objects that have either one or the other should be updated to use _Remove, and the _Delete and _Cancel methods should be marked as deprecated in the documentation.