Remove more  unused bits