More cleanup for comment preservation