removed old style leftovers