remove more #uncommo stuff because #commo now fills that role