More headway on shape matcher
Clear marked shapes so as not to do an unsafe n-squared traversal