got rid of some other old bits