Fixed improper deletes