Grid it, remove commented stuff