more cleanup to user routes