remove dumb tuple2and2 instance
minor cleanup