Removes some lingering UserBit references

Removes some lingering UserBit references