CONFIGURE_ENV and CONFIGURE_OPTIONS cleanup