Makefile changes
Clean up old script