Revert "cleanup"

Conflicts:
	web.js