Clarity updates and removing guide comments