Clean up unneeded code and files.
Merge branch 'web-rewrite'