remove whenever references