Refactor #9860 Delete Etomite database functions
http://tracker.modx.com/issues/9860