aap2app: toolkit: clear old code not used.