Some minor cleanup of content vs defense