added grunt time & cleanup