Comment out unnecessary Flag code, fix Zap