Reverted comments, suppressed warnings