fix removed destroy calls to avoid coredumps