commented lines removed; datastores renamed