Cleaned up rest api-win