USE-flags cleanup