Trimming down the datastore more