grunt and npm cleanups