remove all the no-longer-used stuff