clean up to require fewer libraries