web major cleanup