Windsor clean up