Cleaning up some commented stuff