Ancas cleanup of Karls hacks