cleanup calls to obsolete get/set methods
fix merge conflict