remove unless code