WEB-ING classes cleanup