cleanup no longer shared code