Removed unused DataSource.database variable (cleanup)