More updates to make scripts/remove old makefiles