NXDRIVE-46: Clean-up