drop separate uid for now