clean up for extension api refinements