Remove User::with_bikes_* methods
Merge branch 'users'