various fixes to content and comment removal