Missed one, (Remove code related to legacy OS)