Improved deletion behavior, with regards to (un)expanding nodes