COMP: remove old method calls
Merge branch 'bug-18528-GLMappersModule'