Clear plugin - refs BT#8692