Fix obsolete content cleaning code