Cleaning up database loading methods