simplify and clean up (based on SLING-3027)