Remove dependency from filesystem Util