Remove code for Ubuntu and Mac