Commerce datasource code cleanup