Clean up some old code which doesn't need to be there.