Finished zot cleanup