Destroy model on remove, fix wrong class