some more code cleanup following the guillotine (bug 1073432)
Merge pull request #299 from magopian/1073432-remove-webapps-from-code

[DO NOT MERGE] some more code cleanup following the guillotine (bug 1073432)