More guidance cleanup