[#97] Clean up - simplify DB loaders