Versions should now be fixed. Deletes should now all use flags

* Versioning should now be working for everything using versions
* All deletes have been switched over to use flags