remove deprecated warding stuff