NX-493: Cleanup