Properly undo containers/signs