removed kakadu cruft that was somehow retained across merges