Web: cleanup and named objects