Clean service definition, and remove useless properties
Fix tests