S61890 -- removal of TreeGrid monster hack