more cleanup for lists