Code clean-ups to user bundle.