Remove old style code.