Cleaning up some unused code