cleanup; windows friendly