more removal fixes