Cleaning up some unused stuff