Remove unneeded cb's