Removed unnecessary code from mac version