cleaned out service/implementation classes