Remove two comment rules + other fix ups