iflipb cleanups