Remove some dependencies on dojo modules and use the base Grid methods

instead