Clean up changes in configure and Makefile