USE flags cleanup