code cleanup
#1761 pathways