* cleanup configure and makefile