NX-507: Removing incorrect hdrs and since versions