more cleanup, added NAP and EPA refs