cleanup, removed/merged duplicate-s