Cleaned up grid state