Remove fs dependency