HEMERA-3457: Cleanup