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

Change-Id: I4300e937379d8f1ccb34e7202f5218d09c1d452b