rework around extracting developer tools