FIx edit mode bug
remove obsolete elements