Remove old paste-code and pluralified variable