Removing OS dependency