remove helper methods for testing
Merge branch 'richard'