Cleanup ContentgridNav and ContentgridHelper