get rid of some backwards compatibility