More clean up of grunt and build