2014-11-27; rrink; CHG: cleanup and removal of hard coded values