splash: cleanup destruction a bit