more cleanup, pleaseholder selector