WIP: fixing windows remove