new flags cleanup