Remove not-working strings & barre references