remove some derecated code