Got rid of os calls