cleanup code around new classes /zeus