Removed datasource and fixed oldest getter