removed web code start refactoring for clansing