More removal of unnecessary comments