RNDT: some cleanup