clean up Makefiles
clean up and get things working again