clean up exposed accessors in services