Remove filter-wrapper for now