commented stuff cleanup