Forget neatness when dealing with a messed up network. I've seen perfectly functioning networks downed by such work. On top of that, don't let folk in the closets that are not ready to deal with the failures.