removed ibit from lots of places