[FIX] proper cleanup