remove some old stupid code