finished refactoring
removed web1