Removed windows stuff for submission