Remove working grid methods and tests
Maintain 80 character limit in tests