add FIPS code; remove extraneous code