Added version support to delete request

Folded version handling into VersionType to make it cleaner and easier to read.

Closes #3111