cleaning out more old code