[NX-479] Drop obsolete code