Cleanup os specific files
Fix control for new release