got rid of some old code