Remove references to user ids from PS functions