Clean up nofw specific code.

Library should work stand alone.