Cleaned up some commented stuff