Remove commentQ

Change-Id: I9976b4f1d01797929b51d67b74e6396df1780264