A bit warning cleanup