Added deletion of associated objects