Removed grid references and commented code