revert forester change, code cleanup