comment out broken features

Change-Id: I5a362e4f544b6263067d242823a464d6e7275cf4