Cleaning up some old code.