System Info plugin cleanup