makefiles and some deletes and modifications