structure cleanup
don't need tests