removed some deprecated stuff