MP-155 #comment Refactor - Remove redundant function