Further cleanup configure script