[Ian] cleanup of files and putting the database name back in