warning flags cleanup