cleaning up labels

Change-Id: I0e99ef5b6cfa0da9ed30d8233429436d7f99eb06