Minor database cleanup
Pack Simulator now uses database