Revert "A huge changes for UBike"

This reverts commit e873a83a02a5e7b2957594e893801ff2ecedfb6f.