More cleanup of bank numbers and files and such