more cleanup in pictures