Some cleanup after extensive debugging for NLTE init bug fixed in previous commit