Commit before removing border nodes. Simplifying
Just passed all the built-in tests