TRUNK-2218: remove missed direct method calls

https://tickets.openmrs.org/browse/TRUNK-2218