APW - get rid of very, very naughty code now this is in a sort-of
offical repo somewhere.