code cleanup /zeus