Remove refrences to fs