GH-18 Removed redundant functions/code segments