more configure cleanup