Update makefile to do cleanup itself, rather than relying on script
Add param required to make grid run smoothly