cleanup WIP adding windows8