Merge pull request #52 from 30x/XAPID-985

XAPID-985: remove zombie code