Package and grunt/lint cleanup