commend out stuff causing conflicts for now

Change-Id: Iec94d6bf4d9845f0bd11b9b194863b9c94febeb2