inline state accessor service code from data trait
These were all calling into services() and not actually directly accessing the database at all anyway.
These were all calling into services() and not actually directly accessing the database at all anyway.