Removing duplicate functions to avoid some merge issues for other branches
mentioned in issue #194 (closed)