Cleanup web
more stuff
logs of refactoring