cleanup + missing callback fixed