Remove no-longer-used things