[Fixed] more objects not being destroyed from db when they should

Change-Id: I83ddf109fb876aa9837eea8055bef0c6331fceba