Fixed:  Some bookmark plugin cleanup