copy-paste remnants removed