Remove fs require duplication