big cleanup and rework, disable zipzap for now