more cleanup / experimenting