cleanup catkinization