undohandler
undoItem
clean beacon
more cleanup