WIP: Add overlap removal
This has to go in after atlas/athena!28110 (merged) because the class we depend on here doesn't exist in Athena yet.
This has to go in after atlas/athena!28110 (merged) because the class we depend on here doesn't exist in Athena yet.