Removing eof call from build_database routines given inconsistent performance across servers