Grid cleanup