make clear where options.h came from
add sanity check on cleanup for possible no init