Uncommented out redundant blocks, addressing in issue #503