removing references to the old style