Remove traces of the accordion workaround