Unnecessary classes were removed