remove more old code