Clean up

-- Clean up some stuff from the prior pull request
-- Remove unused code
-- Actually use config for grid variables