Taking out commented out functionality

Possible cause of slowdowns

Supports opengovernment/ops#203