Removed vestigial code
Merge branch 'master' into diagrams