Convert more panels and remove unnecessary ones