Trying to fix broken build - commenting out new features

Signed-off-by: Gregg Coppen <gregg@iaminawe.com>