RUBY-770 Don't need reference to database in FS