[PATCH configure 0/3]: Cleanups to configure