Cleaning up some legacy