Unity cleanup - fix