A bit of grunt cleanup