remove old style code