Removed entity field from delete calls
Added in helper functions to simplify testing