clean up all those extra handles