Cleaned up in DbService