simplify, remove redundant code
merge stable into default