remove cb and entry variables