better cleanup than last time