Removed Fortran dependency