Remove nomcom entries

Change-Id: I992fce773d9717a4f90456a2cab75f8f3da89665