Remove grunt & other cleanups