Cleaned up user routes