Fix grid mixin remove grid variable