Git rid of some CodeSniffer comments

Change-Id: Ie3abd319264b71b7530876f405cfa1dc3424e046