SZ-22: Final cleanup