removed custom view and helper