This code is no longer needed
Merge branch 'master' into report-memory-improvements