clean up Supported logic and display